From: Jan D. <jan.h.d@swipnet.se>
Date: Wed, 6 Jan 2010 14:33:57 +0000 (+0100)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8236^2~57
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=dd00c7014f8d71c5559d8dbba85e4b24071fc939;p=emacs.git

Merge from trunk.
---

dd00c7014f8d71c5559d8dbba85e4b24071fc939